Change expand/collapse icon in header to initially rotate clockwise

* Also remove unused field