Refactor layout

Refactored layouts