cleanup

Removed onPreDraw (leftover from previous build)
General spacing cleanup