Made button slightly larger and DRYer