Update standalone controls for module approach.
Add standalone module to reduce code duplication.