Updated Overall Layout