Partial client stuff
Merge from client
Some more scss stuff