Fixed small error for main view
Pulling from upstream
Pulling from upstream
Converted sass to scss