Fix some bugs
Add scss