Minor UI refactor and add basic menu bar