Added Group focus and move