Added 'remove item', small stylings and guards