Layout simplified + refactoring