Added controller button and removed tap action directly on button