fix some layotus