Factored out some html
Got everything aligned properly
Now to fix the damn Navbar
Need to fix selected on Navbar as well