Some more cleanup in GUI