Added more html and forms
Clean up