refactoring views

reworking messages