Complete rechanged the layout