Rebuilding the top section for a cleaner look.