1.change login layout
merge