ui and code fixes for mumber of items