more UI tweaking