Draw units in proper axis, re-indent code for emacs