Slight improvement on how innital drawing is done, and some cleanup of magic values
and screen placement calculations.