Code refactoring + UI pin description + bug create pin