Refactored submission pages, part 2