Moved some popups to keep things together. Generified Commands being used by popups