First Real commit of the final layout