Add UX functionality