Minor bug fixes

Fixing submit button, still unfixed!!