Clean up merge and UI tweaks