Storage quantity + minor template fixes