Refactoring & added favicon