Some UI tweaking