Design and section fixes
