Merge with Escheria's GUI update