Fix some of the page elements+ Fix Nav bar