added move button stuff, needs fixing