Cosmetic and UI interface update