Consolidate layouts. Add 404