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

Barak