Merge "Item layout tweaking, hook up more assets." into klp-dev