re-design modules