resturctured layout to my current standard