Change the modal window layout

Move namespace, and dependencies out of the accordion.