more work on the UX and UI