Even more robust checks for submissions

Also improved UI