Profile pic issue and remaining changes