Update to UI

Note:
During renaming I missed the sub-component panel updates.
Template updates to Server/Microsoft device class.