Fixed edit profile bug and cleaned up validation