-updated with DisabledButton class
-removed extraneous functions
-minor cleanup