Added buttons to switch between gui
Merge remote-tracking branch 'upstream/master'
Couple fixes for coremod and new build