Draft: Fixed rotation UI unit - fixes #1664