refactored the code
more refactroing - use of macros
app icons added for demo project