Culoured buttons

Changed button to a class instead of a ref and tidied up slightly