Further work on component positioning

See also http://i.imgur.com/FjJIh98.png