Fixes, cleanup and migration
Migration, UI for overview