3.5 and 4 inc iPhones support plus some refactoring