layout changes
Refactoring layout and controllers