Feature/css

merged again from sebaslv/related-docs and made needed changes.
@sebaslv, you can take a look as well.
Remove commented out code here and throughout the code.