Added quantity input

Added quantity input plus some small tweaks