Minor focus & positioning bugfix