Commit 2

Still in the early stages, but finally sorted out the misalignment
issues. Also the menu bar is temporarily disabled.