Cleaned up app layout