Layout

Updated some of the layouts, and added alert message