Multiple minor layout changes.
Now stores number of used hints