more tidying up and fixing small bugs from the last clean up related to highlighted button colour and displayed list