Some button related additions/fixes

Some button related additions/fixes