refactoring first layout