Move the html to a seperate file
Some clean up
Removing the bundle