Changing back habits - display: inline-block and the margin-right hack