Website improvement and slight refactoring