Refactor

Refactored the specs and added in missing alerts in layout
same as empty js assets, can be removed.