Feature/analysis tool presenter rewritten