Simplified DOM structure, started on layout issues