Fix main layout
Merge branch 'master' of github.com:BdayaNinjas/BdayaAdmin
Fixed hr styling
Fixing some bugs