Added save buttons to all edit states / Small styling and ux changes