Added new buttons and correct bars for each device