Front end and workflow fixes