refactor: more compact drawing of controls