Add waiting state. Tweak colors.