UI cleanups and started leap buttons.