Refactored the Button