Cleaning some code
Using the content size of the button to check sizes