moves notice and alert to layout + small fixes