Added custom buttons and working sensors