a few change on layout