Revert 224efa0..4c7483e

This rolls back to commit 224efa0087800b77108840f282960796bedbb4be.
and then some font size changes