[FIX] UI issues