Moved a few components around in the interface.