TODO Redisign this page so on modal save we get the new values