Add input fields to 'In Progress/Private', reorganize/refactor code