Fixed minor errors in css order and moved some js code from the navbar to general.js