So, pick your poison!
I had been using Upfront for over 6 months with much frustration on a number of sites. I could never really get things to go the way they should, whether it be trying to run Upfront on a Bitnami WordPress Stack, or move things to certain places.
So out with Upfront, and in with Divi!
Divi is probably the most comprehensive, fastest WordPress Theme I have ever come across.
Now running over 20 sites on it, with fast load times, great customisations via child themes, and good support. A+ Divi!