Gui tweaks following real test