fixed navigation mostly
fixed navigation to fit to 4 columns max
fixing merge conflicts from updated navigation