Fixed some buggy-ness with edit profiles

+ Bug fixes