Expand browsing options and use of colour for types