More small tweaks, mostly removing extra padding