Made shields repairable
Move buttons out of potion effects icons

-Allow swapping back into main inventory