Merge "Refactor controls ui"