- readme update, layouts refactoring