refactored app layout and removed alerts from individual pages