Updated views and worked out authorization