added favicon and minor refactoring