Fixed navbar floats

Also minor formatting tweaks