Move modules control to bottom

Resolves #364