Refactored submission pages, part 1