Added the message sending fragment to the main screen
Fixed conflicts