added oauth login, more views, tidy view hierarchy