change layout and some component base on Samsung's feedback