Move warning at correct place.
Fix: Reset of amount was not working