Fixed menu to show devices option
more table edits