code cleanup, also: fuck custom buttons