Refactor

Refactored the specs and added in missing alerts in layout
remove commented code