Some more GUI changes