Added UIButton and improved layout.