Some more gui prep work