Shaking part done and minor control changes