Inital work at fixing inventory rendering