[FEATURE] UI changes