Fix services
Move navbar into main layout