Feature/thumb reposition