More UI optimization