Added more handlersand html