...
Some cosmetic changes, added loading image
Lots of refactoring and cosmetics