Makes some design changes, woot!