More fixes to gui pages