UI optimise and bug fix, Adjust for inner grabber.