Usability improvements, add buttons, flow tweaks