Merge "Controls UI - Basic impl"