Clean up paths & Add classes for additional sections