fix nav bars
finished layouts