Some Simple Cleanup in the CN Controller

Moved stuff around, code churn, that sorta thing...

We can now also declare device= for testing and variables
get populated for use on special pages.

Change-Id: Iad0cd606ee5bd392d81212b066eb92d9a9e52b1b