removing iPad browser window
remake of app
fix merge conflicts