Fixed checkbox layout issue to close #402