fix some layout and flag icon issue