Finish revise layout