more fixes for marketplace and shop
updated link overflow in edit
resolved conflict and other stuff
updated button and color