more UI optimization