Made website more modular