Added basic layout and controllers