Refine grid styles, add navbar back in.