Added UI tweaks, clean up whitespace when saving.