Updated look with UIButtons