Refactoring + new feature: position indicator