Added menu, tabs, and cleaned up other stuff