Major Updates to Layout and Clean up