改进页面布局

Change-Id: I1198b1256106db7f9f09c6e85b01a22b25a5af24