added new layouts. fixed backwards compatibility issue.