Device and UI - UX improvements