Added some logic to app and SASS