Updated main page and navbar