Reorg styles
Work on Navbar Buttons
Better Forms