Various design clean-up throughout the app