fixed Nav bar, added elements and cleaned up css
Real Final Version, Forgot to do final push