Added better SASS and notifications