refactoring twards a more moden app layout