Fixes in Button