Refactored - moved notices to layout