cleaner UI flow & updated docs