Add dev-page watermark [BugId: 179].
Use new muxx features to replace some boilerplate [BugId: 180]