First pass at new layout.