Fixed the resolution issue and update issue