Fixed miscellaneous issues
initial Button API commit