Fixed layout in Sell Gui
Fixed merge errors