fixing button themeing and adding the border