Fixed merge.
UI tweaks