Improve control positioning
Make .selected styling consistent