Modify some layout from feeback Hien