Better transitions, tightened up design