Rewrite modules UI
Merge