changed wrapper from layout to individual templates