#761 Styling issues
#762 repair change of switch devices