Button updates, bug fixes

Version 4.2.0