Fixed no. of items to show based on change of uploader ui and other minor fixes