Moved submit button and made code prettier