Updates for intellij on mac and layout fixes to display correctly on 13in screen