Refactor

Refactored the specs and added in missing alerts in layout
seems like it's still here. did you commit your changes and push to update the PR?