Continuing integration of Demons registration.

Mainly changes to UI and some bug fixes.