Code tidy/refactor, favicons

* added favicons
* general code tidy/refactor