Tweaked layouts, renamed some variables.