Fixed some resolution bugs