GUI changes merge