Reorganize, add icon for "More Device Controls"