Fixed form edit and add/changed loading icon