Added topbar menu, some other junk