More auth stuff and view markup structure