Better UI
Re-enabled strategies
Merge branch 'gui'
betere ui, bugfixes