Added topology and HTML to separate stuff