Consolidate into single page design