Changed colours, updated UI