Bug fix and change dialog position