fix laucher page issue like adjust pic size and so on
fix merge conflict
fix merge conflicts again because of the push action by renjie