Fixed minor UI error
Fixed add/delete