Let features refactor.

Rearranges panels after renaming.