UI adjustments and improvement of UX