Some UI tweaks and fixes to MainClient