Added ClientMessageForm
Done some refactoring