Reorganized layout; renamed divs