refactoring towards a more moden app layout