Configurable expand mode, click is now default