Refactor

Refactored the specs and added in missing alerts in layout
idem ibidem, remove all boiler plate