Font lock level
Various visual improvements