Small UI changes
merge conflicts are stupid