updated to basic layout with colours