added notifications and cleaned layout