fix some issue, need to change the layout