Adjusting quotes for html consistency and moved the department declaration up a level for nested devices