Sorting Column with a variable range

I am running into a problem with a worksheet that data changes constantly as more projects are added or deleted. I'm have to button that I want to sort the Project Number for each type or the Variance for each project type column in ascending order.

The worksheet will be subtotaled for each project project type and I want to sort with keeping the project types from moving all over the worksheet.

Also, I know how to insert a line for every time (in this case the Type column changes) but I want to automate the subtotaling also rather than running the code to insert the line and then having to go in and sum each of the columns. I have another tab called Before Subtotaled if anyone can help out there.

Please view the attached file. You will see the code in the file.