final fixing of the lozenge colors
- sidebar tabs in tab_control
- misc whitespace removal
Merging resolution within branch.