Added match types and updated layout and colours