Fixing little style things and pulling Andrew's board changes