Fixed the problem notifications, moved them into the layout code