Updated migrations, new settings options, layout fix