Updated html tags around buttons