Updated app layout