Marjor GUI changes
conflict fix