Several fixes. Logo overlay