Fixed Master/Slave Buttons
Style Changes