bugfixes for submit screen