Added computed margins and some fancy arg defaults
Layout is looking pretty spiffy