Some UI improvements

Updated some colours etc., still in progress