Added navbar to main page
fixed merge issues