changes to the alerts and the application layout so that it fits within the 12 columns
merged updates from design to master