Validation added and charge view updated