fixes #3
fixed #2 and #3 with previous commits
cont working on submission page