added final page layouts and started merging angular