Simplify things
Add favicon & new stylings
Rebasing
Fix conflict between local & remote