Added basic html and functions
Fixed conflict