more changes for screen adaption