Add templates views
Update login_required for expired token
Some quick updates