Suraj || Fixed bug of submit button, doesn't show submit icon after submitting submission.
Suraj || Refactored.