Code review minor fixes and code refactor
Code review fixes
Rename source .scss file
Merge pull request #4 from pbs/code_fixes

Code fixes