Fading buttons, rearrangement, cleanup