Change from Circle to Rectangle Fingers

* Little code cleanup
* Start changing from circles to rectangle fingers