tidied up model package and minor UI improvement