#12: Improved input compononents layout.