UX tweaks, DB fixes