Design tidy (manual rebase)