UI update

More standardizing. More to come.