Started work on top bar design
Top bar partially works and some code has been cleaned up