upgraded account model, hardcoded logo support + performance improvement