Fix navigation and views