minor stuff
Seperated UI from Implementation
Merge pull request #2 from BarakA89/Barak

Barak