Mostly clicked inventory and refactor