Styling edits and better migration handling