Tweak sizes, tidy code and shift parts around to line up better