refactor
Added layout