Move layout() to separate file (helper)