added btn class to buttons where it was missing, updated alert colours and warning button colour
merge conflict resolve