Refactor layout
Add master layout