Quick overhaul of previous commit using UIScrollView