UI tweaks + status modal