Added auto colour and button styling