Window moving

Moving works a bit better now.