Font fix for code on OSX and some other general layout changes