Fixing up 07 Gui interaction issues