Cleanup
Typography improvements
Better position for "editing" red line