Refactor CSS, fix indentation, improve comments