Add close buttons, improve messager view