fixed location of focus rectangle
fixed merge conflict