Cleaned up extra divs & Renamed partial

Made some small changes