renaming UI classes, pt 1
remove trailing whitespace