Fixed rendering, added navbar