changed component name and fixed a few small things
Merge pull request #1 from AlmirKadric/develop

changed component name and fixed a few small things