minor changes - messages implementation
refactoring and adding some more to the view