More tweaks to end button position rules