a bit more UI tweaking