Fixed #165 and altered in inventory rendering also