added tracking support
gui correctly restores on load