updated layout and admin controller
Merge branch 'authenticate' into herokuprod