Final changes in upgrade GUI modularization, will work on factory recipe type GUI modularization next