merged GUI changes