Removing pointless div
Restoring missing alert and notice fields