Fix submission_popover.
Improved styling
Fixed the merge conflict