layouts refactoring
more refactoring