added some ui tidying