Changes to Extensions
Move around of some elements