Adding some page not found checks & more view work