fixed design problems, notification messages added