fixes for: collapsed menu button generated multiple time, incorrect display of checkboxes