Big commit; clean up and improved guide UX