More UI tweaks for first release

More UI tweaks for first release