Reworked Profile editing to a stable state