Improved the quick button callbacks.
Streamlined code.