fixes #48 - Rework startup wizard