[FIX] Small UI updates