Add Consolas and clean up a bit