Updated some stuff, removed HtmlPresenter (will work on it later)