Changed color
Added alerts
Merge branch 'feature/alerts' into develop
Refactoring
Broke up master_layout
Upgraded comments