Stuff should be working

Merged the two branches. So layout, admin Btn and category buttons
should work!