Improved layouts
Added basic authorization