Fixes, migrations, and make app more simple