Fixing the app layout