added all of the licensing and layout updates from layout branch