Added iPhone layout, improved cell click