Updates and UI tweaks