fixed some css with nav button
merging