- ui tidyups and code formatting