Resolve #3372204 "Fix cs"

Closes #3372204 I use some changes from !14 (closed) and fix most of the comments in that MR. Still not sure what should be done with css file.