more movement fixes, more UI