In progress Build screen edits