Little issues to improve CSS performance and cascading

Close #1152