Improved iOS layout