Updated style.scss & some minor stuffs
Merge branch 'beta'