completed layout with drop down menu for device type
Completed merge of msuperd1 work