Improved UX, finishing touches