Changes to definitions and button behaviour.