more work on ux/ui