Preparing for iphone and minor changes throughout all the app