Color change for list and minor code enhancement