UI work on menu bar
Whitespace, and todos