cancel button css
Possible way to refactor
Updated variables for saas
Fixed bug in json
Merge branch 'data' into dev