more UI and tweaks