Fixes

• Minor UI tweaks and bug fixes