Improve layout of control mapping screen