Gui fixes quan

fixed more codepro complaints