Fixed view issues. No routing right now