Improve CSS (for toolbar mostly) + comments