Samples management improvements

Thanks for the suggestions @Kaloyan. I will share these with the dev team. Some of your points have been suggested before so please go add your votes on them: