re-working gui