refactoring screen layouts