Clean message on submit and style fixes